# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.15.47 -> 1.1046.15.48
#	net/ipv4/tcp_input.c	1.36    -> 1.36.1.1
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/03	davidm@hpl.hp.com	1.1046.15.48
# [PATCH] fix TCP roundtrip time update code
# 
# One of those very-hard-to-track-down, trivial-to-fix kind of problems:
# without this patch, TCP roundtrip time measurements will corrupt the
# routing cache's RTT estimates under heavy network load (the bug causes
# RTAX_RTT to go negative, but since its type is u32, you end up with a
# huge positive value...).  From there on, later TCP connections quickly
# will go south.
# 
# The typo was introduced 8 months ago in v1.29 of the file by the patch
# entitled "Cleanup DST metrics and abstrct MSS/PMTU further".
# --------------------------------------------
#
diff -Nru a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_input.c	Mon Sep 22 12:58:53 2003
+++ b/net/ipv4/tcp_input.c	Mon Sep 22 12:58:53 2003
@@ -556,8 +556,8 @@
 			if (m >= dst_metric(dst, RTAX_RTTVAR))
 				dst->metrics[RTAX_RTTVAR-1] = m;
 			else
-				dst->metrics[RTAX_RTT-1] -=
-					(dst->metrics[RTAX_RTT-1] - m)>>2;
+				dst->metrics[RTAX_RTTVAR-1] -=
+					(dst->metrics[RTAX_RTTVAR-1] - m)>>2;
 		}
 
 		if (tp->snd_ssthresh >= 0xFFFF) {